Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <[email protected]>
Tue, 25 Aug 2009 20:54:01 +0000 (22:54 +0200)
committerWolfgang Denk <[email protected]>
Tue, 25 Aug 2009 20:54:01 +0000 (22:54 +0200)

Trivial merge